From: Joakim Verona <joakim@verona.se>
Date: Sat, 24 Aug 2013 16:18:46 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b8e2acdd013a259b64c97292d229d78e9da2e3cd;p=emacs.git

merge from trunk
---

b8e2acdd013a259b64c97292d229d78e9da2e3cd